Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#289 📎 sources - Introduce bottom sheet dialog #555

Merged
merged 39 commits into from
Nov 2, 2020
Merged

#289 📎 sources - Introduce bottom sheet dialog #555

merged 39 commits into from
Nov 2, 2020

Conversation

stefan-niedermann
Copy link
Owner

@stefan-niedermann stefan-niedermann commented Jun 24, 2020 •
edited
Loading

Description

This PR allows one to not only select files from the phone to upload, but also pick contacts and take photos directly from within the app.

Help test

You can download and install the APK safely in parallel to the production version.

Screenshots

1 2
attachments-1 attachments-2

@stefan-niedermann stefan-niedermann self-assigned this Jun 29, 2020
@stefan-niedermann stefan-niedermann mentioned this pull request Aug 13, 2020
Closed
@stefan-niedermann
Merge branch 'master' into 289-upload-sources
10421aa 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
#	app/src/main/res/values/strings.xml
@stefan-niedermann
Adjust to targetSdk 30
34b73be 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Restore default path for switch-case
8bf5224 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
#289 📎 Add more sources to upload attachments
9929931 
Make contacts upload work

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
#289 📎 Add more sources to upload attachments
d773e16 
Minor clean up

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
#289 📎 Add more sources to upload attachments
704273e 
Fix contact picker

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
#289 📎 Add more sources to upload attachments
fbf96fa 
Design fine tuning

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
#289 📎 Add more sources to upload attachments
1417c6b 
Design fine tuning

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
#289 📎 Add more sources to upload attachments
3c7d4f6 
Design fine tuning

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Update minSdk to Kitkat
8f433ce 
https://help.nextcloud.com/t/nextcloud-android-client-3-14-0-rc1-is-out/96673
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Merge branch 'master' into 289-upload-sources
b5d1096 
# Conflicts:
#	app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
@stefan-niedermann
Fix impor
6d3289d 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Use java.time classes to format camera picking filename
96ffc2b 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Use CameraX
78f476e 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Better permission handling for CameraX
0a58eee 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Make actual image capturing work
e62ccdb 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
don't manually set minSdk
db3eacf 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Minor improvements
56fea2a 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Use FLAG_ACTIVITY_SINGLE_TOP instead of FLAG_ACTIVITY_NEW_TASK for Ta…
a2aee6d 
…kePhotoActivity

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Use FLAG_ACTIVITY_SINGLE_TOP instead of FLAG_ACTIVITY_NEW_TASK for Ta…
a6839a0 
…kePhotoActivity

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Allow to toggle camera & flashlight
7ebc173 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Merge branch 'master' into 289-upload-sources
1878160
@stefan-niedermann
Lower targetSdk to 29 because of nextcloud/Android-SingleSignOn#277
572fb47 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Do not continue with contacts picker if camera permissions haven't be…
e646639 
…en granted

Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Minor refactoring
35ff744 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Minor refactoring
f05402c 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Fix crash on Android 4.4
ad41b1d 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Hide camera button on Android < 5
1ebcfa9 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Make sure that without branding the icons are still white
68d56e6 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Remove not needed dependency
d68058c 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Correctly recognize mime type of captured image
611bbce 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Fix position of added attachments
c36ef84 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Minor stuff
7eb093c 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann
Use LiveData for empty content view
ea7895c 
Signed-off-by: Stefan Niedermann <info@niedermann.it>
@stefan-niedermann stefan-niedermann mentioned this pull request Nov 2, 2020
Closed
@stefan-niedermann stefan-niedermann marked this pull request as ready for review November 2, 2020 08:35
@splitt3r
Copy link

splitt3r commented Nov 2, 2020

Awesome work @stefan-niedermann ! It works great. Only a minor idea: Maybe reuse the UI (tab) structure form the web? Currently the images are shown as full images but e. g. a contact is shown in a table structure. The Web UI shows everything in a table structure.

@q-wertz
Copy link

q-wertz commented Nov 2, 2020

Tested and works 🎉 Thanks for the new feature.

Smartphone: Nokia 7 plus with Android 10
Server: Deck v 1.1.2

@stefan-niedermann
Copy link
Owner Author

Fantastic, thank you very much for testing @splitt3r & @q-wertz !

Only a minor idea: Maybe reuse the UI (tab) structure form the web?

I think the Web UI should do it the other way around: If one can generate a preview, we should show the preview and only fall back to the generic table layout if we can't show anything.

Also Nextcloud usually always displays a preview (even for .txt files in the web files app), so i guess Deck is the one who steps out of the line 😉

@splitt3r
Copy link

splitt3r commented Nov 2, 2020

Fantastic, thank you very much for testing @splitt3r & @q-wertz !

Only a minor idea: Maybe reuse the UI (tab) structure form the web?

I think the Web UI should do it the other way around: If one can generate a preview, we should show the preview and only fall back to the generic table layout if we can't show anything.

Also Nextcloud usually always displays a preview (even for .txt files in the web files app), so i guess Deck is the one who steps out of the line 😉

Very good point. But than maybe create a common structure to display images and other files alike? Anyway i think this is more of a follow up issue.

@stefan-niedermann stefan-niedermann merged commit ea7895c into master Nov 2, 2020
@stefan-niedermann stefan-niedermann deleted the 289-upload-sources branch November 10, 2020 21:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@stefan-niedermann stefan-niedermann

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@stefan-niedermann @splitt3r @q-wertz